- Bug fixes and port to 1.14.4